gitweb / test / file with spaceson commit merge and reset: adjust for "reset --hard" messages (228e2eb)
   1This
   2filename
   3contains
   4spaces.